From b1e13aea889bacae1bdfaf908cfb2f7281650796 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Tue, 13 Jul 2004 00:30:45 +0000 Subject: [PATCH] bitkeeper revision 1.1071 (40f32d351AUI5dQyI8HcrYtyF1eppg) minor reordering to /etc/xen/network seems to make it more robust when in an NFS mounted directory. --- tools/examples/network | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examples/network b/tools/examples/network index 1c0505f6f3..9852c34119 100755 --- a/tools/examples/network +++ b/tools/examples/network @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh #============================================================================ # Example Xen network start/stop script. # Xend calls a network script when it starts. @@ -99,10 +99,6 @@ create_bridge () { brctl sethello ${bridge} 0 fi ifconfig ${bridge} up - # Don't add $dev to $bridge if it's already on a bridge. - if ! brctl show | grep -q ${dev} ; then - brctl addif ${bridge} ${dev} - fi } # Usage: antispoofing dev bridge @@ -139,6 +135,10 @@ case ${OP} in create_bridge ${netdev} ${bridge} transfer_addrs ${netdev} ${bridge} transfer_routes ${netdev} ${bridge} + # Don't add $dev to $bridge if it's already on a bridge. + if ! brctl show | grep -q ${netdev} ; then + brctl addif ${bridge} ${netdev} + fi if [ ${antispoof} == 'yes' ] ; then antispoofing ${netdev} ${bridge} -- 2.30.2